New patch pass-hardening-flags.patch

diff --git a/debian/changelog b/debian/changelog
index 019a65a07bbd91e4761cc9d2d6d6816d04e0e83e..2e08c1ce26b5777ee1de15e56b8ad477b47fce20 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ utf8proc (2.2.0-1) UNRELEASED; urgency=medium
   * Drop patches no longer needed, refresh remaining
   * Update debian/libutf8proc2.symbols
   * Update debian/copyright
+  * New patch pass-hardening-flags.patch
 
  -- Graham Inggs <ginggs@debian.org>  Fri, 27 Jul 2018 09:00:25 +0000
 

diff --git a/debian/patches/pass-hardening-flags.patch b/debian/patches/pass-hardening-flags.patch
new file mode 100644 (file)
index 0000000..dccdf08
--- /dev/null
+++ b/debian/patches/pass-hardening-flags.patch
@@ -0,0 +1,69 @@
+Description: Pass hardening flags
+Forwarded: not-yet
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2018-07-27
+
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@
+ PICFLAG = -fPIC
+ C99FLAG = -std=c99
+ WCFLAGS = -Wall -pedantic
+-UCFLAGS = $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS $(UTF8PROC_DEFINES)
++UCFLAGS = $(CPPFLAGS) $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS $(UTF8PROC_DEFINES)
+ 
+ # shared-library version MAJOR.MINOR.PATCH ... this may be *different*
+ # from the utf8proc version number because it indicates ABI compatibility,
+@@ -115,31 +115,31 @@
+       $(CC) $(UCFLAGS) -c -o test/tests.o test/tests.c
+ 
+ test/normtest: test/normtest.c test/tests.o utf8proc.o utf8proc.h test/tests.h
+-      $(CC) $(UCFLAGS) test/normtest.c test/tests.o utf8proc.o -o $@
++      $(CC) $(UCFLAGS) $(LDFLAGS) test/normtest.c test/tests.o utf8proc.o -o $@
+ 
+ test/graphemetest: test/graphemetest.c test/tests.o utf8proc.o utf8proc.h test/tests.h
+-      $(CC) $(UCFLAGS) test/graphemetest.c test/tests.o utf8proc.o -o $@
++      $(CC) $(UCFLAGS) $(LDFLAGS) test/graphemetest.c test/tests.o utf8proc.o -o $@
+ 
+ test/printproperty: test/printproperty.c test/tests.o utf8proc.o utf8proc.h test/tests.h
+-      $(CC) $(UCFLAGS) test/printproperty.c test/tests.o utf8proc.o -o $@
++      $(CC) $(UCFLAGS) $(LDFLAGS) test/printproperty.c test/tests.o utf8proc.o -o $@
+ 
+ test/charwidth: test/charwidth.c test/tests.o utf8proc.o utf8proc.h test/tests.h
+-      $(CC) $(UCFLAGS) test/charwidth.c test/tests.o utf8proc.o -o $@
++      $(CC) $(UCFLAGS) $(LDFLAGS) test/charwidth.c test/tests.o utf8proc.o -o $@
+ 
+ test/valid: test/valid.c test/tests.o utf8proc.o utf8proc.h test/tests.h
+-      $(CC) $(UCFLAGS) test/valid.c test/tests.o utf8proc.o -o $@
++      $(CC) $(UCFLAGS) $(LDFLAGS) test/valid.c test/tests.o utf8proc.o -o $@
+ 
+ test/iterate: test/iterate.c test/tests.o utf8proc.o utf8proc.h test/tests.h
+-      $(CC) $(UCFLAGS) test/iterate.c test/tests.o utf8proc.o -o $@
++      $(CC) $(UCFLAGS) $(LDFLAGS) test/iterate.c test/tests.o utf8proc.o -o $@
+ 
+ test/case: test/case.c test/tests.o utf8proc.o utf8proc.h test/tests.h
+-      $(CC) $(UCFLAGS) test/case.c test/tests.o utf8proc.o -o $@
++      $(CC) $(UCFLAGS) $(LDFLAGS) test/case.c test/tests.o utf8proc.o -o $@
+ 
+ test/custom: test/custom.c test/tests.o utf8proc.o utf8proc.h test/tests.h
+-      $(CC) $(UCFLAGS) test/custom.c test/tests.o utf8proc.o -o $@
++      $(CC) $(UCFLAGS) $(LDFLAGS) test/custom.c test/tests.o utf8proc.o -o $@
+ 
+ test/misc: test/misc.c test/tests.o utf8proc.o utf8proc.h test/tests.h
+-      $(CC) $(UCFLAGS) test/misc.c test/tests.o utf8proc.o -o $@
++      $(CC) $(UCFLAGS) $(LDFLAGS) test/misc.c test/tests.o utf8proc.o -o $@
+ 
+ check: test/normtest data/NormalizationTest.txt test/graphemetest data/GraphemeBreakTest.txt test/printproperty test/case test/custom test/charwidth test/misc test/valid test/iterate bench/bench.c bench/util.c bench/util.h utf8proc.o
+       $(MAKE) -C bench
+--- a/bench/Makefile
++++ b/bench/Makefile
+@@ -1,7 +1,8 @@
+ CURL=curl
+ 
+ CC = cc
+-CFLAGS = -O2 -std=c99 -pedantic -Wall
++CFLAGS ?= -O2
++CFLAGS += -std=c99 -pedantic -Wall
+ 
+ all: bench
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 62165402336c6877b50855c63c60e03df06d458e..36761a2bf87c1a61d25e6297b57a6e408185891f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 use-unicode-data.patch
+pass-hardening-flags.patch